Don't to focus insensitive widgets. (#68203)

Tue Feb 26 18:01:10 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkwidget.c (gtk_widget_grab_focus): Don't
        to focus insensitive widgets. (#68203)

        * gtk/gtkentry.c (gtk_entry_state_changed): Clear any
        current selection if we become insensitive. (#68203)

        * gtk/gtkentry.c (gtk_entry_grab_focus): Don't
        select the text if the entry isn't editable. (#67203)

        * gtk/gtkentry.c: Activate keybindings when not editable,
        but supress keybindings that change the text. (#65848, #68203)

        * gtk/gtkentry.c (gtk_entry_set_property): Reset the
        IM context for the entry when it is made not editable.

diff --git a/ChangeLog b/ChangeLog
index d82cb43bf25861e9e3e71fe3e2ab02345f882946..6d21017cd7db778f374fe07a9ede9a3020c127c0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+Tue Feb 26 18:01:10 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.c (gtk_widget_grab_focus): Don't
+       to focus insensitive widgets. (#68203)
+
+       * gtk/gtkentry.c (gtk_entry_state_changed): Clear any
+       current selection if we become insensitive. (#68203)
+
+       * gtk/gtkentry.c (gtk_entry_grab_focus): Don't
+       select the text if the entry isn't editable. (#67203)
+
+       * gtk/gtkentry.c: Activate keybindings when not editable,
+       but supress keybindings that change the text. (#65848, #68203)
+
+       * gtk/gtkentry.c (gtk_entry_set_property): Reset the
+       IM context for the entry when it is made not editable.
+
 Tue Feb 26 17:04:44 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkcolorsel.c (update_color): Emit ::color_changed

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index d82cb43bf25861e9e3e71fe3e2ab02345f882946..6d21017cd7db778f374fe07a9ede9a3020c127c0 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,20 @@
+Tue Feb 26 18:01:10 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.c (gtk_widget_grab_focus): Don't
+       to focus insensitive widgets. (#68203)
+
+       * gtk/gtkentry.c (gtk_entry_state_changed): Clear any
+       current selection if we become insensitive. (#68203)
+
+       * gtk/gtkentry.c (gtk_entry_grab_focus): Don't
+       select the text if the entry isn't editable. (#67203)
+
+       * gtk/gtkentry.c: Activate keybindings when not editable,
+       but supress keybindings that change the text. (#65848, #68203)
+
+       * gtk/gtkentry.c (gtk_entry_set_property): Reset the
+       IM context for the entry when it is made not editable.
+
 Tue Feb 26 17:04:44 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkcolorsel.c (update_color): Emit ::color_changed

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d82cb43bf25861e9e3e71fe3e2ab02345f882946..6d21017cd7db778f374fe07a9ede9a3020c127c0 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,20 @@
+Tue Feb 26 18:01:10 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.c (gtk_widget_grab_focus): Don't
+       to focus insensitive widgets. (#68203)
+
+       * gtk/gtkentry.c (gtk_entry_state_changed): Clear any
+       current selection if we become insensitive. (#68203)
+
+       * gtk/gtkentry.c (gtk_entry_grab_focus): Don't
+       select the text if the entry isn't editable. (#67203)
+
+       * gtk/gtkentry.c: Activate keybindings when not editable,
+       but supress keybindings that change the text. (#65848, #68203)
+
+       * gtk/gtkentry.c (gtk_entry_set_property): Reset the
+       IM context for the entry when it is made not editable.
+
 Tue Feb 26 17:04:44 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkcolorsel.c (update_color): Emit ::color_changed

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index d82cb43bf25861e9e3e71fe3e2ab02345f882946..6d21017cd7db778f374fe07a9ede9a3020c127c0 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,20 @@
+Tue Feb 26 18:01:10 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.c (gtk_widget_grab_focus): Don't
+       to focus insensitive widgets. (#68203)
+
+       * gtk/gtkentry.c (gtk_entry_state_changed): Clear any
+       current selection if we become insensitive. (#68203)
+
+       * gtk/gtkentry.c (gtk_entry_grab_focus): Don't
+       select the text if the entry isn't editable. (#67203)
+
+       * gtk/gtkentry.c: Activate keybindings when not editable,
+       but supress keybindings that change the text. (#65848, #68203)
+
+       * gtk/gtkentry.c (gtk_entry_set_property): Reset the
+       IM context for the entry when it is made not editable.
+
 Tue Feb 26 17:04:44 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkcolorsel.c (update_color): Emit ::color_changed

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index d82cb43bf25861e9e3e71fe3e2ab02345f882946..6d21017cd7db778f374fe07a9ede9a3020c127c0 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,20 @@
+Tue Feb 26 18:01:10 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.c (gtk_widget_grab_focus): Don't
+       to focus insensitive widgets. (#68203)
+
+       * gtk/gtkentry.c (gtk_entry_state_changed): Clear any
+       current selection if we become insensitive. (#68203)
+
+       * gtk/gtkentry.c (gtk_entry_grab_focus): Don't
+       select the text if the entry isn't editable. (#67203)
+
+       * gtk/gtkentry.c: Activate keybindings when not editable,
+       but supress keybindings that change the text. (#65848, #68203)
+
+       * gtk/gtkentry.c (gtk_entry_set_property): Reset the
+       IM context for the entry when it is made not editable.
+
 Tue Feb 26 17:04:44 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkcolorsel.c (update_color): Emit ::color_changed

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index d82cb43bf25861e9e3e71fe3e2ab02345f882946..6d21017cd7db778f374fe07a9ede9a3020c127c0 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,20 @@
+Tue Feb 26 18:01:10 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.c (gtk_widget_grab_focus): Don't
+       to focus insensitive widgets. (#68203)
+
+       * gtk/gtkentry.c (gtk_entry_state_changed): Clear any
+       current selection if we become insensitive. (#68203)
+
+       * gtk/gtkentry.c (gtk_entry_grab_focus): Don't
+       select the text if the entry isn't editable. (#67203)
+
+       * gtk/gtkentry.c: Activate keybindings when not editable,
+       but supress keybindings that change the text. (#65848, #68203)
+
+       * gtk/gtkentry.c (gtk_entry_set_property): Reset the
+       IM context for the entry when it is made not editable.
+
 Tue Feb 26 17:04:44 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkcolorsel.c (update_color): Emit ::color_changed

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d82cb43bf25861e9e3e71fe3e2ab02345f882946..6d21017cd7db778f374fe07a9ede9a3020c127c0 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,20 @@
+Tue Feb 26 18:01:10 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.c (gtk_widget_grab_focus): Don't
+       to focus insensitive widgets. (#68203)
+
+       * gtk/gtkentry.c (gtk_entry_state_changed): Clear any
+       current selection if we become insensitive. (#68203)
+
+       * gtk/gtkentry.c (gtk_entry_grab_focus): Don't
+       select the text if the entry isn't editable. (#67203)
+
+       * gtk/gtkentry.c: Activate keybindings when not editable,
+       but supress keybindings that change the text. (#65848, #68203)
+
+       * gtk/gtkentry.c (gtk_entry_set_property): Reset the
+       IM context for the entry when it is made not editable.
+
 Tue Feb 26 17:04:44 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkcolorsel.c (update_color): Emit ::color_changed

diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 663b8a4026e18d201e8c2a4e9e59f909f8dea94b..830a9af1712c17190cc73bd54ca62f7b0410a09b 100644 (file)
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -292,6 +292,8 @@ static void         gtk_entry_do_popup                 (GtkEntry       *entry,
                                                        GdkEventButton *event);
 static gboolean     gtk_entry_mnemonic_activate        (GtkWidget      *widget,
                                                        gboolean        group_cycling);
+static void         gtk_entry_state_changed            (GtkWidget      *widget,
+                                                       GtkStateType    previous_state);
 static void         gtk_entry_check_cursor_blink       (GtkEntry       *entry);
 static void         gtk_entry_pend_cursor_blink        (GtkEntry       *entry);
 static void         get_text_area_size                 (GtkEntry       *entry,
@@ -767,6 +769,9 @@ gtk_entry_set_property (GObject         *object,
          {
            entry->editable = new_value;
            gtk_entry_queue_draw (entry);
+
+           if (!entry->editable)
+             gtk_entry_reset_im_context (entry);
          }
       }
       break;
@@ -1524,18 +1529,19 @@ gtk_entry_key_press (GtkWidget   *widget,
 {
   GtkEntry *entry = GTK_ENTRY (widget);
 
-  if (!entry->editable)
-    return FALSE;
-
   gtk_entry_pend_cursor_blink (entry);
-  
-  if (gtk_im_context_filter_keypress (entry->im_context, event))
+
+  if (entry->editable)
     {
-      gtk_entry_obscure_mouse_cursor (entry);
-      entry->need_im_reset = TRUE;
-      return TRUE;
+      if (gtk_im_context_filter_keypress (entry->im_context, event))
+       {
+         gtk_entry_obscure_mouse_cursor (entry);
+         entry->need_im_reset = TRUE;
+         return TRUE;
+       }
     }
-  else if (GTK_WIDGET_CLASS (parent_class)->key_press_event (widget, event))
+
+  if (GTK_WIDGET_CLASS (parent_class)->key_press_event (widget, event))
     /* Activate key bindings
      */
     return TRUE;
@@ -1550,15 +1556,15 @@ gtk_entry_key_release (GtkWidget   *widget,
   GtkEntry *entry = GTK_ENTRY (widget);
 
   if (!entry->editable)
-    return FALSE;
-
-  if (gtk_im_context_filter_keypress (entry->im_context, event))
     {
-      entry->need_im_reset = TRUE;
-      return TRUE;
+      if (gtk_im_context_filter_keypress (entry->im_context, event))
+       {
+         entry->need_im_reset = TRUE;
+         return TRUE;
+       }
     }
-  else
-    return GTK_WIDGET_CLASS (parent_class)->key_release_event (widget, event);
+
+  return GTK_WIDGET_CLASS (parent_class)->key_release_event (widget, event);
 }
 
 static gint
@@ -1604,6 +1610,7 @@ gtk_entry_focus_out (GtkWidget     *widget,
 static void
 gtk_entry_grab_focus (GtkWidget        *widget)
 {
+  GtkEntry *entry = GTK_ENTRY (widget);
   gboolean select_on_focus;
   
   GTK_WIDGET_CLASS (parent_class)->grab_focus (widget);
@@ -1613,7 +1620,7 @@ gtk_entry_grab_focus (GtkWidget        *widget)
                &select_on_focus,
                NULL);
   
-  if (select_on_focus && !GTK_ENTRY (widget)->in_click)
+  if (select_on_focus && entry->editable && !entry->in_click)
     gtk_editable_select_region (GTK_EDITABLE (widget), 0, -1);
 }
 
@@ -1632,12 +1639,20 @@ static void
 gtk_entry_state_changed (GtkWidget      *widget,
                         GtkStateType    previous_state)
 {
+  GtkEntry *entry = GTK_ENTRY (widget);
+  
   if (GTK_WIDGET_REALIZED (widget))
     {
       gdk_window_set_background (widget->window, &widget->style->base[GTK_WIDGET_STATE (widget)]);
-      gdk_window_set_background (GTK_ENTRY (widget)->text_area, &widget->style->base[GTK_WIDGET_STATE (widget)]);
+      gdk_window_set_background (entry->text_area, &widget->style->base[GTK_WIDGET_STATE (widget)]);
     }
 
+  if (!GTK_WIDGET_IS_SENSITIVE (widget))
+    {
+      /* Clear any selection */
+      gtk_editable_select_region (GTK_EDITABLE (entry), entry->current_pos, entry->current_pos);      
+    }
+  
   gtk_widget_queue_clear (widget);
 }
 
@@ -2064,10 +2079,13 @@ gtk_entry_insert_at_cursor (GtkEntry    *entry,
   GtkEditable *editable = GTK_EDITABLE (entry);
   gint pos = entry->current_pos;
 
-  gtk_entry_reset_im_context (entry);
+  if (entry->editable)
+    {
+      gtk_entry_reset_im_context (entry);
 
-  gtk_editable_insert_text (editable, str, -1, &pos);
-  gtk_editable_set_position (editable, pos);
+      gtk_editable_insert_text (editable, str, -1, &pos);
+      gtk_editable_set_position (editable, pos);
+    }
 }
 
 static void
@@ -2164,14 +2182,19 @@ gtk_entry_cut_clipboard (GtkEntry *entry)
   gint start, end;
 
   gtk_entry_copy_clipboard (entry);
-  if (gtk_editable_get_selection_bounds (editable, &start, &end))
-    gtk_editable_delete_text (editable, start, end);
+
+  if (entry->editable)
+    {
+      if (gtk_editable_get_selection_bounds (editable, &start, &end))
+       gtk_editable_delete_text (editable, start, end);
+    }
 }
 
 static void
 gtk_entry_paste_clipboard (GtkEntry *entry)
 {
-  gtk_entry_paste (entry, GDK_NONE);
+  if (entry->editable)
+    gtk_entry_paste (entry, GDK_NONE);
 }
 
 static void
@@ -3767,7 +3790,8 @@ unichar_chosen_func (const char *text,
 {
   GtkEntry *entry = GTK_ENTRY (data);
 
-  gtk_entry_enter_text (entry, text);
+  if (entry->editable)
+    gtk_entry_enter_text (entry, text);
 }
 
 typedef struct

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index b2f89b8228c05d1e5f70b59e80581496b2edbbd0..00d62d34daba687a340efd4dccb20840c6a2acb9 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -3308,6 +3308,9 @@ gtk_widget_grab_focus (GtkWidget *widget)
 {
   g_return_if_fail (GTK_IS_WIDGET (widget));
 
+  if (!GTK_WIDGET_IS_SENSITIVE (widget))
+    return;
+  
   g_object_ref (G_OBJECT (widget));
   gtk_signal_emit (GTK_OBJECT (widget), widget_signals[GRAB_FOCUS]);
   g_object_notify (G_OBJECT (widget), "has_focus");